From 5c93ee5d5c37b6ff8cac06d366efc8e79fd2fe0c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 15 Nov 2004 16:22:49 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gdk-pixbuf/ChangeLog | 6 ++++++ gdk-pixbuf/queryloaders.c | 4 +++- gtk/gtktreemodel.c | 3 +++ 7 files changed, 32 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5287972495..93064c3d5b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-11-15 Matthias Clasen + + * gtk/gtktreemodel.c (gtk_tree_path_prev): Return FALSE if + depth is 0 (noticed by Tim Janik) + 2004-11-15 Erwann Chenede - * gtk/gtkfilesel.c: fix unselect in multiple selection (#156805) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5287972495..93064c3d5b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2004-11-15 Matthias Clasen + + * gtk/gtktreemodel.c (gtk_tree_path_prev): Return FALSE if + depth is 0 (noticed by Tim Janik) + 2004-11-15 Erwann Chenede - * gtk/gtkfilesel.c: fix unselect in multiple selection (#156805) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5287972495..93064c3d5b 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2004-11-15 Matthias Clasen + + * gtk/gtktreemodel.c (gtk_tree_path_prev): Return FALSE if + depth is 0 (noticed by Tim Janik) + 2004-11-15 Erwann Chenede - * gtk/gtkfilesel.c: fix unselect in multiple selection (#156805) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5287972495..93064c3d5b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2004-11-15 Matthias Clasen + + * gtk/gtktreemodel.c (gtk_tree_path_prev): Return FALSE if + depth is 0 (noticed by Tim Janik) + 2004-11-15 Erwann Chenede - * gtk/gtkfilesel.c: fix unselect in multiple selection (#156805) diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index eed61bde44..786dd035b5 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,9 @@ +2004-11-15 Matthias Clasen + + * queryloaders.c (query_module): Set vtable->module before + calling fill_vtable(), since gdk-pixbuf-io.c does does the + same and modules may rely on it. (#158177, Dan Winship) + 2004-11-12 Matthias Clasen * gdk-pixbuf-io.c (gdk_pixbuf_io_init): Don't use diff --git a/gdk-pixbuf/queryloaders.c b/gdk-pixbuf/queryloaders.c index 21aa320eb0..1fc5d58b3e 100644 --- a/gdk-pixbuf/queryloaders.c +++ b/gdk-pixbuf/queryloaders.c @@ -181,7 +181,9 @@ query_module (const char *dir, const char *file) #endif info = g_new0 (GdkPixbufFormat, 1); vtable = g_new0 (GdkPixbufModule, 1); - + + vtable->module = module; + (*fill_info) (info); (*fill_vtable) (vtable); diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c index 148f153f26..033c5cfc46 100644 --- a/gtk/gtktreemodel.c +++ b/gtk/gtktreemodel.c @@ -734,6 +734,9 @@ gtk_tree_path_prev (GtkTreePath *path) { g_return_val_if_fail (path != NULL, FALSE); + if (path->depth == 0) + return FALSE; + if (path->indices[path->depth - 1] == 0) return FALSE; -- 2.30.2